Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 05:34:22 +0000 (21:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 05:34:22 +0000 (21:34 -0800)
commite067edd9fb6039c21cfff92bbbd44b2af6aef889
tree2cf575ecc517a8b3909249adc08c5d30077461af
parent1daefb67a8e492dcb7335aefe3633b9fb16fb470
parent2b81d5d77d27af9e32ecb1ada7c412475e5fe256
Merge from trunk.